themes/helveticus/template/includes/Header.ftl | 154 +++++++++++++------------
1 file changed, 78 insertions(+), 76 deletions(-)
diff --git a/themes/helveticus/template/includes/Header.ftl b/themes/helveticus/template/includes/Header.ftl
index 1651ac5bc8..2347a71bc1 100644
--- a/themes/helveticus/template/includes/Header.ftl
+++ b/themes/helveticus/template/includes/Header.ftl
@@ -21,82 +21,84 @@ under the License.
<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
<#assign langDir = "rtl">
#if>
+
+<#assign themeSpecificLessFilePath = "/helveticus/" + visualTheme.visualThemeId.replace("_", "-")?lower_case?replace("ı", "i") + ".less">
-
-
- <#assign csrfDefenseStrategy = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("security", "csrf.defense.strategy", "org.apache.ofbiz.security.NoCsrfDefenseStrategy", delegator)>
- <#if csrfDefenseStrategy != "org.apache.ofbiz.security.NoCsrfDefenseStrategy">
-
- #if>
- ${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}#if>
-<#if layoutSettings.shortcutIcon?has_content>
- <#assign shortcutIcon = layoutSettings.shortcutIcon/>
-<#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
- <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
-#if>
-<#if shortcutIcon?has_content>
- " type="image/x-icon">
- " type="image/png">
- " type="image/png">
- " type="image/png">
- " type="image/png">
-#if>
-<#if layoutSettings.VT_STYLESHEET_LESS?has_content>
- <#list layoutSettings.VT_STYLESHEET_LESS as styleSheet>
-
- #list>
-#if>
- " type="text/css"/>
-<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
- <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-
- #list>
-#if>
-<#if layoutSettings.javaScripts?has_content>
-<#--layoutSettings.javaScripts is a list of java scripts. -->
-<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
- <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
- <#list layoutSettings.javaScripts as javaScript>
- <#if javaScriptsSet.contains(javaScript)>
- <#assign nothing = javaScriptsSet.remove(javaScript)/>
-
+
+
+ <#assign csrfDefenseStrategy = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("security", "csrf.defense.strategy", "org.apache.ofbiz.security.NoCsrfDefenseStrategy", delegator)>
+ <#if csrfDefenseStrategy != "org.apache.ofbiz.security.NoCsrfDefenseStrategy">
+
+ #if>
+ ${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}#if>
+ <#if layoutSettings.shortcutIcon?has_content>
+ <#assign shortcutIcon = layoutSettings.shortcutIcon/>
+ <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+ <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
+ #if>
+ <#if shortcutIcon?has_content>
+ " type="image/x-icon">
+ " type="image/png">
+ " type="image/png">
+ " type="image/png">
+ " type="image/png">
+ #if>
+ <#if layoutSettings.VT_STYLESHEET_LESS?has_content>
+ <#list layoutSettings.VT_STYLESHEET_LESS as styleSheet>
+
+ #list>
+ #if>
+
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+
+ #list>
+ #if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#-- layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+
+ #if>
+ #list>
#if>
- #list>
-#if>
-<#if layoutSettings.styleSheets?has_content>
-<#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
- <#list layoutSettings.styleSheets as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_STYLESHEET?has_content>
- <#list layoutSettings.VT_STYLESHEET as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
-<#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
- <#list layoutSettings.rtlStyleSheets as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
- <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_EXTRA_HEAD?has_content>
- <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
- ${extraHead}
- #list>
-#if>
-<#if lastParameters??><#assign parametersURL = "&" + lastParameters>#if>
-<#if layoutSettings.WEB_ANALYTICS?has_content>
-
-#if>
-
+ <#if layoutSettings.styleSheets?has_content>
+ <#-- layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet. -->
+ <#list layoutSettings.styleSheets as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_STYLESHEET?has_content>
+ <#list layoutSettings.VT_STYLESHEET as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
+ <#-- layoutSettings.rtlStyleSheets is a list of rtl style sheets. -->
+ <#list layoutSettings.rtlStyleSheets as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
+ <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_EXTRA_HEAD?has_content>
+ <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
+ ${extraHead}
+ #list>
+ #if>
+ <#if lastParameters??><#assign parametersURL = "&" + lastParameters>#if>
+ <#if layoutSettings.WEB_ANALYTICS?has_content>
+
+ #if>
+
themes/rainbowstone/template/includes/Header.ftl | 154 ++++++++++++-----------
1 file changed, 78 insertions(+), 76 deletions(-)
diff --git a/themes/rainbowstone/template/includes/Header.ftl b/themes/rainbowstone/template/includes/Header.ftl
index 7b1d016e92..dd71398887 100644
--- a/themes/rainbowstone/template/includes/Header.ftl
+++ b/themes/rainbowstone/template/includes/Header.ftl
@@ -21,82 +21,84 @@ under the License.
<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
<#assign langDir = "rtl">
#if>
+
+<#assign themeSpecificLessFilePath = "/rainbowstone/" + visualTheme.visualThemeId.replace("_", "-")?lower_case?replace("ı", "i") + ".less">
-
-
- <#assign csrfDefenseStrategy = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("security", "csrf.defense.strategy", "org.apache.ofbiz.security.NoCsrfDefenseStrategy", delegator)>
- <#if csrfDefenseStrategy != "org.apache.ofbiz.security.NoCsrfDefenseStrategy">
-
- #if>
- ${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}#if>
-<#if layoutSettings.shortcutIcon?has_content>
- <#assign shortcutIcon = layoutSettings.shortcutIcon/>
-<#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
- <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
-#if>
-<#if shortcutIcon?has_content>
- " type="image/x-icon">
- " type="image/png">
- " type="image/png">
- " type="image/png">
- " type="image/png">
-#if>
-<#if layoutSettings.VT_STYLESHEET_LESS?has_content>
- <#list layoutSettings.VT_STYLESHEET_LESS as styleSheet>
-
- #list>
-#if>
- " type="text/css"/>
-<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
- <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
-
- #list>
-#if>
-<#if layoutSettings.javaScripts?has_content>
-<#--layoutSettings.javaScripts is a list of java scripts. -->
-<#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
- <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
- <#list layoutSettings.javaScripts as javaScript>
- <#if javaScriptsSet.contains(javaScript)>
- <#assign nothing = javaScriptsSet.remove(javaScript)/>
-
+
+
+ <#assign csrfDefenseStrategy = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("security", "csrf.defense.strategy", "org.apache.ofbiz.security.NoCsrfDefenseStrategy", delegator)>
+ <#if csrfDefenseStrategy != "org.apache.ofbiz.security.NoCsrfDefenseStrategy">
+
+ #if>
+ ${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}#if>
+ <#if layoutSettings.shortcutIcon?has_content>
+ <#assign shortcutIcon = layoutSettings.shortcutIcon/>
+ <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+ <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
+ #if>
+ <#if shortcutIcon?has_content>
+ " type="image/x-icon">
+ " type="image/png">
+ " type="image/png">
+ " type="image/png">
+ " type="image/png">
+ #if>
+ <#if layoutSettings.VT_STYLESHEET_LESS?has_content>
+ <#list layoutSettings.VT_STYLESHEET_LESS as styleSheet>
+
+ #list>
+ #if>
+
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+
+ #list>
+ #if>
+ <#if layoutSettings.javaScripts?has_content>
+ <#-- layoutSettings.javaScripts is a list of java scripts. -->
+ <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order -->
+ <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+
+ #if>
+ #list>
#if>
- #list>
-#if>
-<#if layoutSettings.styleSheets?has_content>
-<#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
- <#list layoutSettings.styleSheets as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_STYLESHEET?has_content>
- <#list layoutSettings.VT_STYLESHEET as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
-<#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
- <#list layoutSettings.rtlStyleSheets as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
- <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
-
- #list>
-#if>
-<#if layoutSettings.VT_EXTRA_HEAD?has_content>
- <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
- ${extraHead}
- #list>
-#if>
-<#if lastParameters??><#assign parametersURL = "&" + lastParameters>#if>
-<#if layoutSettings.WEB_ANALYTICS?has_content>
-
-#if>
-
+ <#if layoutSettings.styleSheets?has_content>
+ <#-- layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet. -->
+ <#list layoutSettings.styleSheets as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_STYLESHEET?has_content>
+ <#list layoutSettings.VT_STYLESHEET as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
+ <#-- layoutSettings.rtlStyleSheets is a list of rtl style sheets. -->
+ <#list layoutSettings.rtlStyleSheets as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
+ <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
+
+ #list>
+ #if>
+ <#if layoutSettings.VT_EXTRA_HEAD?has_content>
+ <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
+ ${extraHead}
+ #list>
+ #if>
+ <#if lastParameters??><#assign parametersURL = "&" + lastParameters>#if>
+ <#if layoutSettings.WEB_ANALYTICS?has_content>
+
+ #if>
+